From da13995f26c6b773d1999fbb2ada977af9ea0f65 Mon Sep 17 00:00:00 2001 From: GPSBabel Date: Thu, 4 Jun 2020 02:46:11 -0500 Subject: [PATCH] Remove Mapsource .mps format (#588) * Fix numerous instances of shadowing confusion. Inspired by a cppcon talk and our recent conversations about warnings, I took a closer look at shadowing variables in our code and I wasn't proud of my findings. We had a lot of code that was writing to local variables or function arguments when it thought it was operating on globals or (soon) method-member variables. I made a rather half-hearted pass at changing this by splitting up huge functions, renaming arguments, renaming globals to reflect their future status as method variables (foo_), and generally cleaning things up. The amound of effort I spent on each format was approximately equal to its expected lifespan - I'm not spending an hour on cleanups on formats I should instead be deleting. In a future submit, I'll try to find some combination of -W flags on our targets that allows us to not regress easily. * Fix merge conflict I just created in gdb.cc * Delete workspace.xml * Delete the same link in garmin_icons.xml that I deleted twice yesterday. Fix more esoteric warnings. * Reapply MORE of yesterday's commits. Seriously, I know this has been committed and is in HEAD... * Attempt to fix list detachment within route.cc * Remove Mapsource The Mapsource format has been deprecated by Garmin for something like 15 years. Later versions of Mapsource used GDB and Basecamp, Garmin's first replacement for the Mapsource lineage, was used exclusively in later versions. I've reviewed list traffic and floated a discussion on the list. The code style was never really very flexible and it it bears a high maintenance cost that we can no longer afford. This format is dead. * Remove more pieces of Mapsource. * Change Netstumbler test to not use Mapsource for staging. More cleanups. * Fix netstumbler so I can delete Mapsource. Ugh. * Update netstumbler with IWYU. --- CMakeLists.txt | 2 +- GPSBabel.pro | 2 +- Makefile.in | 5 +- mapsource.cc => deprecated/mapsource.cc | 0 netstumbler.cc | 46 ++- reference/format0.txt | 1 - reference/format1.txt | 1 - reference/format2.txt | 1 - reference/format3.txt | 14 - reference/help.txt | 7 - reference/netstumbler.gpx | 264 ++++++++++++++++++ reference/netstumbler.mps | Bin 4838 -> 0 bytes testo.d/{ => deprecated}/mapsource.test | 0 testo.d/netstumbler.test | 6 +- vecs.h | 9 - xmldoc/chapters/garmin_icons.xml | 3 - xmldoc/filters/options/transform-rte.xml | 2 +- xmldoc/filters/options/transform-trk.xml | 2 +- xmldoc/formats/mapsource.xml | 27 -- .../formats/options/mapsource-mpsmergeout.xml | 5 - .../formats/options/mapsource-mpsusedepth.xml | 5 - .../formats/options/mapsource-mpsuseprox.xml | 5 - .../formats/options/mapsource-mpsverout.xml | 5 - xmldoc/formats/options/mapsource-snlen.xml | 4 - xmldoc/formats/options/mapsource-snwhite.xml | 4 - 25 files changed, 293 insertions(+), 127 deletions(-) rename mapsource.cc => deprecated/mapsource.cc (100%) create mode 100644 reference/netstumbler.gpx delete mode 100644 reference/netstumbler.mps rename testo.d/{ => deprecated}/mapsource.test (100%) delete mode 100644 xmldoc/formats/mapsource.xml delete mode 100644 xmldoc/formats/options/mapsource-mpsmergeout.xml delete mode 100644 xmldoc/formats/options/mapsource-mpsusedepth.xml delete mode 100644 xmldoc/formats/options/mapsource-mpsuseprox.xml delete mode 100644 xmldoc/formats/options/mapsource-mpsverout.xml delete mode 100644 xmldoc/formats/options/mapsource-snlen.xml delete mode 100644 xmldoc/formats/options/mapsource-snwhite.xml diff --git a/CMakeLists.txt b/CMakeLists.txt index 393727d38..1a5b27ead 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -28,7 +28,7 @@ include_directories(AFTER SYSTEM ${Qt5Core_INCLUDE_DIRS}) add_definitions(${Qt5Core_DEFINITIONS}) set(MINIMAL_FMTS - magproto.cc explorist_ini.cc gpx.cc geo.cc mapsend.cc mapsource.cc garmin.cc + magproto.cc explorist_ini.cc gpx.cc geo.cc mapsend.cc garmin.cc garmin_device_xml.cc garmin_tables.cc internal_styles.cc nmea.cc kml.cc wbt-200.cc ) diff --git a/GPSBabel.pro b/GPSBabel.pro index 4b6c35e49..10537d028 100644 --- a/GPSBabel.pro +++ b/GPSBabel.pro @@ -23,7 +23,7 @@ CONFIG += c++14 TEMPLATE = app -MINIMAL_FMTS = magproto.cc explorist_ini.cc gpx.cc geo.cc mapsend.cc mapsource.cc garmin.cc \ +MINIMAL_FMTS = magproto.cc explorist_ini.cc gpx.cc geo.cc mapsend.cc garmin.cc \ garmin_device_xml.cc garmin_tables.cc internal_styles.cc nmea.cc \ kml.cc wbt-200.cc diff --git a/Makefile.in b/Makefile.in index 5d34efdd7..8b471c0f0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -61,7 +61,7 @@ LDFLAGS=$(EXTRA_LDFLAGS) @LDFLAGS@ PREFIX=@prefix@ INSTALL_DIR=$(DESTDIR)/$(PREFIX) -MINIMAL_FMTS=magproto.o gpx.o geo.o mapsend.o mapsource.o garmin.o \ +MINIMAL_FMTS=magproto.o gpx.o geo.o mapsend.o garmin.o \ garmin_device_xml.o garmin_tables.o internal_styles.o nmea.o kml.o \ wbt-200.o ozi.o pcx.o gdb.o gtrnctr.o xcsv.o explorist_ini.o @@ -856,9 +856,6 @@ mapfactor.o: mapfactor.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ mapsend.o: mapsend.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ mapsend.h magellan.h -mapsource.o: mapsource.cc defs.h config.h zlib/zlib.h zlib/zconf.h \ - formspec.h inifile.h gbfile.h session.h src/core/datetime.h \ - src/core/optional.h garmin_tables.h jeeps/gpsmath.h jeeps/gpsport.h mkshort.o: mkshort.cc defs.h config.h zlib/zlib.h zlib/zconf.h formspec.h \ inifile.h gbfile.h session.h src/core/datetime.h src/core/optional.h \ cet.h diff --git a/mapsource.cc b/deprecated/mapsource.cc similarity index 100% rename from mapsource.cc rename to deprecated/mapsource.cc diff --git a/netstumbler.cc b/netstumbler.cc index 3ab3d9269..53d724eff 100644 --- a/netstumbler.cc +++ b/netstumbler.cc @@ -1,7 +1,7 @@ /* Read Netstumbler data files. - Copyright (C) 2004, 2005 Robert Lipe, robertlipe+source@gpsbabel.org and + Copyright (C) 2004-2020 Robert Lipe, robertlipe+source@gpsbabel.org and John Temples; gpsns@xargs.com This program is free software; you can redistribute it and/or modify @@ -20,20 +20,20 @@ */ -#include // for isspace -#include // for snprintf -#include // for atoi, atof, qsort, strtol -#include // for strcpy, strlen, memset, strncmp, strstr -#include // for mktime - -#include // for QString -#include // for foreach - -#include "defs.h" -#include "cet_util.h" // for cet_convert_init -#include "csv_util.h" // for csv_lineparse -#include "gbfile.h" // for gbfclose, gbfgetstr, gbfopen, gbfile - +#include // for QDate +#include // for QDateTime +#include // for QString +#include // for QTime +#include // for QVector +#include // for UTC +#include // for isspace +#include // for snprintf +#include // for atof, atoi, qsort, strtol +#include // for strcpy, strlen, strncmp, strstr +#include "cet_util.h" // for cet_convert_init +#include "csv_util.h" // for csv_lineparse +#include "defs.h" // for arglist_t, Waypoint, ff_cap, WaypointList, ff_cap_none, ddmm2degrees, ARG_NOMINMAX, ARGTYPE_STRING, ff_cap_read, get_crc32, lrtrim, waypt_add, xfree, xmalloc, ff_type_file, ARGTYPE_BOOL, CET_CHARSET_ASCII, CET_CHARSET_UTF8, CSTR, NULL_POS_OPS, ff_vecs_t +#include "gbfile.h" // for gbfclose, gbfgetstr, gbfopen, gbfile static gbfile* file_in; static char* nseicon = nullptr; @@ -96,16 +96,16 @@ data_read() int stealth_num = 0, whitespace_num = 0; long flags = 0; int speed = 0, channel = 0; - struct tm tm; int line = 0; WaypointList tmp_waypt_list; - - memset(&tm, 0, sizeof(tm)); + QDate date; + QTime time; while ((ibuf = gbfgetstr(file_in))) { int len; int stealth = 0; + if ((line++ == 0) && file_in->unicode) { cet_convert_init(CET_CHARSET_UTF8, 1); } @@ -116,9 +116,7 @@ data_read() if (ibuf[0] == '#') { if (strncmp(&ibuf[2], "$DateGMT:", 9) == 0) { - tm.tm_year = atoi(&ibuf[12]) - 1900; - tm.tm_mon = atoi(&ibuf[17]) - 1; - tm.tm_mday = atoi(&ibuf[20]); + date = QDate::fromString(ibuf + 12, "yyyy-MM-dd"); } /* @@ -185,9 +183,7 @@ data_read() break; case 5: /* time */ - tm.tm_hour = atoi(field); - tm.tm_min = atoi(&field[3]); - tm.tm_sec = atoi(&field[6]); + time = QTime::fromString(field, "hh:mm:ss"); break; case 8: /* flags */ @@ -250,7 +246,7 @@ data_read() wpt_tmp->description = desc; wpt_tmp->longitude = lon; wpt_tmp->latitude = lat; - wpt_tmp->SetCreationTime(mktime(&tm)); + wpt_tmp->SetCreationTime(QDateTime(date, time, Qt::UTC)); tmp_waypt_list.waypt_add(wpt_tmp); } diff --git a/reference/format0.txt b/reference/format0.txt index 931434e37..36d574256 100644 --- a/reference/format0.txt +++ b/reference/format0.txt @@ -36,7 +36,6 @@ garmin301 Garmin 301 Custom position and heartrate garmin_g1000 csv Garmin G1000 datalog input filter file glogbook xml Garmin Logbook XML gdb gdb Garmin MapSource - gdb -mapsource mps Garmin MapSource - mps garmin_txt txt Garmin MapSource - txt (tab delimited) pcx pcx Garmin PCX5 garmin_poi Garmin POI database diff --git a/reference/format1.txt b/reference/format1.txt index 8d8553037..bf7abce7e 100644 --- a/reference/format1.txt +++ b/reference/format1.txt @@ -39,7 +39,6 @@ file garmin301 Garmin 301 Custom position and heartrate file garmin_g1000 csv Garmin G1000 datalog input filter file file glogbook xml Garmin Logbook XML file gdb gdb Garmin MapSource - gdb -file mapsource mps Garmin MapSource - mps file garmin_txt txt Garmin MapSource - txt (tab delimited) file pcx pcx Garmin PCX5 file garmin_poi Garmin POI database diff --git a/reference/format2.txt b/reference/format2.txt index a84209903..440ae9bd4 100644 --- a/reference/format2.txt +++ b/reference/format2.txt @@ -39,7 +39,6 @@ file rw---- garmin301 Garmin 301 Custom position and heartrate file --rw-- garmin_g1000 csv Garmin G1000 datalog input filter file file --rw-- glogbook xml Garmin Logbook XML file rwrwrw gdb gdb Garmin MapSource - gdb -file rwrwrw mapsource mps Garmin MapSource - mps file rwrwrw garmin_txt txt Garmin MapSource - txt (tab delimited) file rwrwrw pcx pcx Garmin PCX5 file rw---- garmin_poi Garmin POI database diff --git a/reference/format3.txt b/reference/format3.txt index 3e8e82d96..937f29a12 100644 --- a/reference/format3.txt +++ b/reference/format3.txt @@ -362,20 +362,6 @@ option gdb via Drop route points that do not have an equivalent waypoint (hidden option gdb roadbook Include major turn points (with description) from calculated route boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_gdb.html#fmt_gdb_o_roadbook -file rwrwrw mapsource mps Garmin MapSource - mps mapsource - https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html -option mapsource snlen Length of generated shortnames integer 10 1 https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_snlen - -option mapsource snwhite Allow whitespace synth. shortnames boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_snwhite - -option mapsource mpsverout Version of mapsource file to generate (3,4,5) integer https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_mpsverout - -option mapsource mpsmergeout Merge output with existing file boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_mpsmergeout - -option mapsource mpsusedepth Use depth values on output (default is ignore) boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_mpsusedepth - -option mapsource mpsuseprox Use proximity values on output (default is ignore) boolean https://www.gpsbabel.org/WEB_DOC_DIR/fmt_mapsource.html#fmt_mapsource_o_mpsuseprox - file rwrwrw garmin_txt txt Garmin MapSource - txt (tab delimited) garmin_txt https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_txt.html option garmin_txt date Read/Write date format (i.e. yyyy/mm/dd) string https://www.gpsbabel.org/WEB_DOC_DIR/fmt_garmin_txt.html#fmt_garmin_txt_o_date diff --git a/reference/help.txt b/reference/help.txt index 717b880b2..ab2aa7499 100644 --- a/reference/help.txt +++ b/reference/help.txt @@ -189,13 +189,6 @@ File Types (-i and -o options): ver Version of gdb file to generate (1..3) via (0/1) Drop route points that do not have an equivalent w roadbook (0/1) Include major turn points (with description) from - mapsource Garmin MapSource - mps - snlen Length of generated shortnames - snwhite (0/1) Allow whitespace synth. shortnames - mpsverout Version of mapsource file to generate (3,4,5) - mpsmergeout (0/1) Merge output with existing file - mpsusedepth (0/1) Use depth values on output (default is ignore) - mpsuseprox (0/1) Use proximity values on output (default is ignore) garmin_txt Garmin MapSource - txt (tab delimited) date Read/Write date format (i.e. yyyy/mm/dd) datum GPS datum (def. WGS 84) diff --git a/reference/netstumbler.gpx b/reference/netstumbler.gpx new file mode 100644 index 000000000..4de456be4 --- /dev/null +++ b/reference/netstumbler.gpx @@ -0,0 +1,264 @@ + + + + + + + linksys + 11 Mbps/Ch 6/0f:06:25:77:0d:1f + 11 Mbps/Ch 6/0f:06:25:77:0d:1f + Green Square + + + + default + 0 Mbps/Ch 6/0f:05:5d:fa:f3:34 + 0 Mbps/Ch 6/0f:05:5d:fa:f3:34 + Green Square + + + + Stealth/1 + 11 Mbps/Ch 6/0f:40:96:44:c0:cc + 11 Mbps/Ch 6/0f:40:96:44:c0:cc + Red Diamond + + + + msu88 + 11 Mbps/Ch 6/0f:0c:41:bc:2a:8c + 11 Mbps/Ch 6/0f:0c:41:bc:2a:8c + Green Square + + + + linksys/3 + 11 Mbps/Ch 6/0f:06:25:a4:77:2e + 11 Mbps/Ch 6/0f:06:25:a4:77:2e + Green Square + + + + default/9 + 54 Mbps/Ch 6/0f:0d:88:8d:16:4f + 54 Mbps/Ch 6/0f:0d:88:8d:16:4f + Green Square + + + + silicon + 11 Mbps/Ch 6/0f:30:bd:c1:3b:16 + 11 Mbps/Ch 6/0f:30:bd:c1:3b:16 + Red Square + + + + purnet + 54 Mbps/Ch 6/0f:0c:41:ab:45:66 + 54 Mbps/Ch 6/0f:0c:41:ab:45:66 + Green Square + + + + Harvey + 11 Mbps/Ch 8/0f:0d:88:1e:a5:6e + 11 Mbps/Ch 8/0f:0d:88:1e:a5:6e + Green Square + + + + X6604 + 11 Mbps/Ch 6/0f:a0:c5:69:65:10 + 11 Mbps/Ch 6/0f:a0:c5:69:65:10 + Green Square + + + + Scott + 54 Mbps/Ch 10/0f:0d:93:88:3f:c1 + 54 Mbps/Ch 10/0f:0d:93:88:3f:c1 + Red Square + + + + NETGEAR + 11 Mbps/Ch 11/0f:09:5b:6e:59:90 + 11 Mbps/Ch 11/0f:09:5b:6e:59:90 + Green Square + + + + Stealth/2 + 54 Mbps/Ch 5/00:05:5d:fb:02:bf + 54 Mbps/Ch 5/00:05:5d:fb:02:bf + Red Diamond + + + + cones + 2 Mbps/Ch 6/0f:40:96:25:a2:b1 + 2 Mbps/Ch 6/0f:40:96:25:a2:b1 + Green Square + + + + default/10 + 54 Mbps/Ch 6/0f:0f:3d:00:d2:3f + 54 Mbps/Ch 6/0f:0f:3d:00:d2:3f + Green Square + + + + McKee + 54 Mbps/Ch 3/0f:0c:41:74:6b:96 + 54 Mbps/Ch 3/0f:0c:41:74:6b:96 + Red Square + + + + airport + 54 Mbps/Ch 10/0f:0a:95:f2:aa:0e + 54 Mbps/Ch 10/0f:0a:95:f2:aa:0e + Red Square + + + + merv + 11 Mbps/Ch 6/0f:06:25:f0:e0:85 + 11 Mbps/Ch 6/0f:06:25:f0:e0:85 + Green Square + + + + home network + 54 Mbps/Ch 6/0f:0f:66:2d:d0:bf + 54 Mbps/Ch 6/0f:0f:66:2d:d0:bf + Green Square + + + + Whitespace/1 + 11 Mbps/Ch 1/0f:02:2d:2b:81:cf + 11 Mbps/Ch 1/0f:02:2d:2b:81:cf + Red Square + + + + wifi + 2 Mbps/Ch 6/0f:40:96:43:5b:9d + 2 Mbps/Ch 6/0f:40:96:43:5b:9d + Green Square + + + + dsppower + 54 Mbps/Ch 6/0f:06:25:f7:6c:c9 + 54 Mbps/Ch 6/0f:06:25:f7:6c:c9 + Green Square + + + + linksys/4 + 11 Mbps/Ch 6/0f:0c:41:3e:1a:e8 + 11 Mbps/Ch 6/0f:0c:41:3e:1a:e8 + Green Square + + + + CAMELOT + 11 Mbps/Ch 6/0f:06:25:05:24:3d + 11 Mbps/Ch 6/0f:06:25:05:24:3d + Red Square + + + + linksys/6 + 11 Mbps/Ch 6/0f:0c:41:b6:fe:62 + 11 Mbps/Ch 6/0f:0c:41:b6:fe:62 + Green Square + + + + linksys/7 + 54 Mbps/Ch 1/0f:0c:41:74:d0:76 + 54 Mbps/Ch 1/0f:0c:41:74:d0:76 + Green Square + + + + house_net + 54 Mbps/Ch 2/0f:0f:66:0b:cf:0f + 54 Mbps/Ch 2/0f:0f:66:0b:cf:0f + Red Square + + + + NETGEAR/2 + 11 Mbps/Ch 11/0f:09:5b:6f:a7:88 + 11 Mbps/Ch 11/0f:09:5b:6f:a7:88 + Green Square + + + + linksys/5 + 11 Mbps/Ch 6/0f:0c:41:43:87:14 + 11 Mbps/Ch 6/0f:0c:41:43:87:14 + Green Square + + + + Richard + 54 Mbps/Ch 6/4a:e2:7d:43:b0:49 + 54 Mbps/Ch 6/4a:e2:7d:43:b0:49 + Green Square + + + + Wireless/1 + 11 Mbps/Ch 11/0f:09:5b:39:ae:a2 + 11 Mbps/Ch 11/0f:09:5b:39:ae:a2 + Green Square + + + + Nordge + 54 Mbps/Ch 6/0f:0d:88:ea:b7:24 + 54 Mbps/Ch 6/0f:0d:88:ea:b7:24 + Red Square + + + + tom + 2 Mbps/Ch 11/0f:06:25:60:6c:b1 + 2 Mbps/Ch 11/0f:06:25:60:6c:b1 + Green Square + + + + default/8 + 22 Mbps/Ch 6/0f:0d:88:86:cf:c9 + 22 Mbps/Ch 6/0f:0d:88:86:cf:c9 + Green Square + + + + JJ + 11 Mbps/Ch 1/0f:60:1d:f6:90:40 + 11 Mbps/Ch 1/0f:60:1d:f6:90:40 + Red Square + + + + purell + 11 Mbps/Ch 6/0f:0c:41:bc:2b:00 + 11 Mbps/Ch 6/0f:0c:41:bc:2b:00 + Green Square + + + + Wireless + 11 Mbps/Ch 1/0f:30:ab:16:7e:50 + 11 Mbps/Ch 1/0f:30:ab:16:7e:50 + Green Square + + diff --git a/reference/netstumbler.mps b/reference/netstumbler.mps deleted file mode 100644 index 1862bedc55577763f416c172fd16064477a3fffc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 4838 zcmb7IO^6&t6z)~Qzk@+MC<{7;5Tg>N`gdj?UY6Y@ag&X>8=MdX>EFzd*_~l}X4l>L zla=+9gEs{QFCGG#qaH-X;K3k~fH`Og9t2TTy63bYImPOlY3t2achAmTwx_qd-dErI z-uGV3a=7Ap$~}srEHsr__GfNyX7%McWvSmPmGqKEsjko}=qBj8@&@~Vz13VlA8v*0 za`d^2K8lijS-cbz_~zKR=@W{omX@7PSe|c`tTGLNTA-OwsQ~pr4gP;jnHgO^B5sXc zU0~npo*&r#R!{r`#lJfQ5L}GOJKrGybYFZEOb-GZ0v&WitTZY9TS@%Yo^Q8$jj}4< zlM#Hj5R)IzAO!mbL9HFmYlzSY;lezhuY%i-0hWAea@1>va+ zh6;`gnhn*A@Oc^F42&dD){7u~8b#z)y$Avqfo&u@(0s8}%0MB6kqF8)@t(}W=eHuV zd=x=2jeR=spjw406Cq2*6guRE5H?#)x4m8j;PD?Ka_2b&V804<3XTV^3cABEh^0~v z4vAZ1SG*89{qDM7SO?F48Ii^j6kj5M%fNQPFu}@*pO*t3|G3@V@V5jmIRR(Cj>zAS zq4;S3Rc-`40jdu+i$8@1com$nEQ*R(4!`hKL}s_L!*d_9S?#gFHLy%jsn|(Mf8q95 z-FB~#{b#R60^s?E8;DgfI~MTa`hvG z0P(M?96=3Chfxn^4Qf*`Fy@3>5eD^oM1l_x2E>9{rWEMVj2)mFI2lEl=Y)y!>Z}0$ z!d|p-IU?Q-6kZ#*fT0hwZe+9Q87at~`AS!aBHi zIVSi0n+;%82R7792sE&5plCBG0eJ|x1lIiSh5#+^f9I2!oZLgc7iojwW(F2e5gegS8QPdmFo*#B> z*DoGRw%K6x*Y5}g;$r9rS^`0HpsIqKfg&#xuP0n=HiKpn2Txvz$wRkM^vqf`^u&^C zo>*y8BDfuTVW-pH^t<9UISIc$Ga&O#1VBmxpGkrWST49|wwQ!qY%D75Nw*IV$QS1j z1eAfH4tO={KBzYMXvmucfzKrKbIXe-UpigH!O>d-vS%#`H=e-s!;@CIGtJ$_+X*#l0wL<$T0{N0bPc0?dJgrR}ciGgkd41rpU^% zf_8Ht2#t0>^k17WoNfOyAaEiZg2sJ0U^5v|hZQ2wDQc0orqOgzM(oKfJi)Z^!UBST zv@kXw1YlR#oFW)K5Dn=$0ePy7A)#TNW@A7F!CawQ0TtEOBnZ49R+?_Z?jjY-04{w$ zAio_(0FV@{vcalQgNg?XfJ4EU!W1qty6W|2*Khe@SnSKY*9YY65riQp5qb@5HY}s0 zPGW&i>ZjUW?;Pr@(~^)J+4-dI+u*R%T1FP~T!A-+UVBYQM-Kk(UQD*%L!K!5!bpYO zk}R6o@-#yl_k(muL+U*U1c70w!r@WTN{Vrs&ajz?U}iGHgkUXu5I|D!RXJBWT1A5~!TV*wk|GvepjG4IQ10Tdy4FpSAh|70WJ ZZp_Zf?2yV%=@oWTnF2xb!`3Ux%zy0kmPG&n diff --git a/testo.d/mapsource.test b/testo.d/deprecated/mapsource.test similarity index 100% rename from testo.d/mapsource.test rename to testo.d/deprecated/mapsource.test diff --git a/testo.d/netstumbler.test b/testo.d/netstumbler.test index bf73c694d..7989a7219 100644 --- a/testo.d/netstumbler.test +++ b/testo.d/netstumbler.test @@ -1,7 +1,7 @@ # # NetStumbler Summary File (read-only) # -rm -f ${TMPDIR}/netstumbler.mps -gpsbabel -i netstumbler -f ${REFERENCE}/netstumbler.txt -o mapsource -F ${TMPDIR}/netstumbler.mps -bincompare ${TMPDIR}/netstumbler.mps ${REFERENCE}/netstumbler.mps +rm -f ${TMPDIR}/netstumbler.gpx +gpsbabel -i netstumbler -f ${REFERENCE}/netstumbler.txt -o gpx -F ${TMPDIR}/netstumbler.gpx +compare ${TMPDIR}/netstumbler.gpx ${REFERENCE}/netstumbler.gpx diff --git a/vecs.h b/vecs.h index a8d7de611..81659ca7b 100644 --- a/vecs.h +++ b/vecs.h @@ -58,7 +58,6 @@ extern ff_vecs_t magX_fvecs; extern ff_vecs_t garmin_vecs; extern ff_vecs_t gdb_vecs; extern ff_vecs_t mapsend_vecs; -extern ff_vecs_t mps_vecs; extern ff_vecs_t ozi_vecs; extern ff_vecs_t pcx_vecs; #if MAXIMAL_ENABLED @@ -274,7 +273,6 @@ private: LegacyFormat garmin_fmt {garmin_vecs}; LegacyFormat gdb_fmt {gdb_vecs}; LegacyFormat mapsend_fmt {mapsend_vecs}; - LegacyFormat mps_fmt {mps_vecs}; NmeaFormat nmea_fmt; LegacyFormat ozi_fmt {ozi_vecs}; LegacyFormat pcx_fmt {pcx_vecs}; @@ -479,13 +477,6 @@ private: nullptr, nullptr, }, - { - &mps_fmt, - "mapsource", - "Garmin MapSource - mps", - "mps", - nullptr, - }, { &nmea_fmt, "nmea", diff --git a/xmldoc/chapters/garmin_icons.xml b/xmldoc/chapters/garmin_icons.xml index aa6e1721f..6805a5887 100644 --- a/xmldoc/chapters/garmin_icons.xml +++ b/xmldoc/chapters/garmin_icons.xml @@ -11,9 +11,6 @@ These values are also used internally by the , BCR - , - - Mapsource , and PCX diff --git a/xmldoc/filters/options/transform-rte.xml b/xmldoc/filters/options/transform-rte.xml index 4382e0f5b..08ff8b48a 100644 --- a/xmldoc/filters/options/transform-rte.xml +++ b/xmldoc/filters/options/transform-rte.xml @@ -5,7 +5,7 @@ This option selects the destination type of this filter to be routes. Choose th Converting a pile of waypoints to a GPX route Say you you have a data file that came from CSV file that you want to convert -to a GPX route that can be loaded into Mapsource. Use the following command: +to a GPX route that can be loaded into Basecamp. Use the following command: gpsbabel -i csv -f blah.txt -x transform,rte=wpt -o gdb -F blah.gdb diff --git a/xmldoc/filters/options/transform-trk.xml b/xmldoc/filters/options/transform-trk.xml index d17d98b9f..99b1c8a57 100644 --- a/xmldoc/filters/options/transform-trk.xml +++ b/xmldoc/filters/options/transform-trk.xml @@ -7,7 +7,7 @@ A single track will be created in the sequence they appear in the input. Converting a pile of waypoints to a GPX track Say you you have a data file that came from CSV file that you want to convert -to a GPX track that can be loaded into Mapsource. Use the following command: +to a GPX track that can be loaded into Basecamp. Use the following command: gpsbabel -i csv -f blah.txt -x transform,trk=wpt -o gdb -F blah.gdb diff --git a/xmldoc/formats/mapsource.xml b/xmldoc/formats/mapsource.xml deleted file mode 100644 index 1d3c97d92..000000000 --- a/xmldoc/formats/mapsource.xml +++ /dev/null @@ -1,27 +0,0 @@ - - This format supports the Garmin Mapsource product family. - - - This format is based on significant reverse-engineering and guesswork. - GPSBabel's output appears to be compatible with the various versions of - MapSource. Icon mapping is attempted between different MapSource versions. - Altitude is supported, but proximity and depth are not. - - - Naming files *.mps will allow file->open in Mapsource to find the files - more easily. - - - Versions 3, 4, and 5 of the Mapsource data format are handled automatically - on input. By default the output is version 5. (Until 3/2004, it was - version 3, but since Mapsource updates are free, the convenience of - having modern icon sets outweighs the backward compatibility concern. - Users of other versions can either upgrade or specify the switches to - get output in a compatible format.) Waypoints, routes, and tracklogs are - all handled, but map sets are ignored. - - - Information on the Garmin Mapsource format was provided by Ian Cowley and - Mark Bradley. The code was implemented by Robert Lipe and Mark Bradley. - - diff --git a/xmldoc/formats/options/mapsource-mpsmergeout.xml b/xmldoc/formats/options/mapsource-mpsmergeout.xml deleted file mode 100644 index 8b06e42d2..000000000 --- a/xmldoc/formats/options/mapsource-mpsmergeout.xml +++ /dev/null @@ -1,5 +0,0 @@ - -This option causes the output to be merged with a pre-existing output file. -This allows MapSource sections that aren't handled by GPSBabel (e.g. map sets) -to be preserved. - diff --git a/xmldoc/formats/options/mapsource-mpsusedepth.xml b/xmldoc/formats/options/mapsource-mpsusedepth.xml deleted file mode 100644 index 08b6dfd34..000000000 --- a/xmldoc/formats/options/mapsource-mpsusedepth.xml +++ /dev/null @@ -1,5 +0,0 @@ - -This option causes GPSBabel to write depth values for waypoints. Most -input formats do not support depth values, so the default is to not write -them. - diff --git a/xmldoc/formats/options/mapsource-mpsuseprox.xml b/xmldoc/formats/options/mapsource-mpsuseprox.xml deleted file mode 100644 index c09a64b5f..000000000 --- a/xmldoc/formats/options/mapsource-mpsuseprox.xml +++ /dev/null @@ -1,5 +0,0 @@ - -This option causes GPSBabel to write proximity values for waypoints. Most -input formats do not support proximity values, so the default is to not write -them. - diff --git a/xmldoc/formats/options/mapsource-mpsverout.xml b/xmldoc/formats/options/mapsource-mpsverout.xml deleted file mode 100644 index 6aa3d7bbd..000000000 --- a/xmldoc/formats/options/mapsource-mpsverout.xml +++ /dev/null @@ -1,5 +0,0 @@ - -This option specifies the format version for the output file. The default -is version 5, as noted above. Supported versions are 3, 4, and 5. - - diff --git a/xmldoc/formats/options/mapsource-snlen.xml b/xmldoc/formats/options/mapsource-snlen.xml deleted file mode 100644 index 40e494453..000000000 --- a/xmldoc/formats/options/mapsource-snlen.xml +++ /dev/null @@ -1,4 +0,0 @@ - -This option specifies the length of generated short names on output. The -default is 10 characters. - diff --git a/xmldoc/formats/options/mapsource-snwhite.xml b/xmldoc/formats/options/mapsource-snwhite.xml deleted file mode 100644 index 0655b1894..000000000 --- a/xmldoc/formats/options/mapsource-snwhite.xml +++ /dev/null @@ -1,4 +0,0 @@ - -This option specifies whether to allow whitespace (space, tab, etc.) in -generated short names on output. The default is to not allow whitespace. - -- 2.30.2